From: Tim Deegan <Tim.Deegan@citrix.com>
Date: Wed, 9 Feb 2011 12:03:09 +0000 (+0000)
Subject: x86/mm/shadow: fix unlocking on error path in p2m allocator
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10795
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=ebe3e6440ce49e51c41620161961c4b39c373276;p=xen.git

x86/mm/shadow: fix unlocking on error path in p2m allocator
One unlock path wasn't gated to match the lock.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 65a2b03e4f..dd9a1555ae 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -1634,7 +1634,8 @@ shadow_alloc_p2m_page(struct domain *d)
     if ( d->arch.paging.shadow.total_pages 
          < shadow_min_acceptable_pages(d) + 1 )
     {
-        shadow_unlock(d);
+        if ( do_locking )
+            shadow_unlock(d);
         return NULL;
     }